From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 14 Mar 2007 17:41:12 +0000 (+0000)
Subject: *Defer to normaliseRange6() if needed
X-Git-Tag: 1.31.0-rc.0~53735
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=dd703702a19eb5b289363c1365fa9695e132733b;p=lhc%2Fweb%2Fwiklou.git

*Defer to normaliseRange6() if needed
---

diff --git a/includes/Block.php b/includes/Block.php
index 6242975507..ee75fb1785 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -644,6 +644,8 @@ class Block
 	 * For example, 127.111.113.151/24 -> 127.111.113.0/24
 	 */
 	static function normaliseRange( $range ) {
+		// Use IPv6 functions if needed
+		if ( IP::isIPv6($range) ) return self::normaliseRange6( $range );
 		$parts = explode( '/', $range );
 		if ( count( $parts ) == 2 ) {
 			$shift = 32 - $parts[1];